bitkeeper revision 1.4 (3ddbb7aeGoGNHUawtm-9NYBGb7Zbkw)

boris's changes for better management of physical memory

diff --git a/xen-2.4.16/common/domain.c b/xen-2.4.16/common/domain.c
index 784b4e46e61e54cc120f74d5d67d5b69e850ac8b..51d9209778fc76007c4df59bc0e73c24a1806fbd 100644 (file)
--- a/xen-2.4.16/common/domain.c
+++ b/xen-2.4.16/common/domain.c
@@ -55,7 +55,7 @@ struct task_struct *do_newdomain(void)
      */
     p->blk_ring_base = (blk_ring_t *)(p->shared_info + 1);
     p->net_ring_base = (net_ring_t *)(p->blk_ring_base + 1);
-    p->pg_head = p->pg_tail = p->tot_pages = 0;
+    p->pg_head = p->tot_pages = 0;
     write_lock_irq(&tasklist_lock);
     SET_LINKS(p);
     write_unlock_irq(&tasklist_lock);
@@ -325,7 +325,7 @@ static unsigned int alloc_new_dom_mem(struct task_struct *p, unsigned int kbytes
 {
 
     struct list_head *temp;
-    struct pfn_info *pf;
+    struct pfn_info *pf, *pf_head;
     unsigned int alloc_pfns;
     unsigned int req_pages;
 
@@ -339,22 +339,27 @@ static unsigned int alloc_new_dom_mem(struct task_struct *p, unsigned int kbytes
     /* allocate pages and build a thread through frame_table */
     temp = free_list.next;
     printk("bd240 debug: DOM%d requesting %d pages\n", p->domain, req_pages);
-    for(alloc_pfns = req_pages; alloc_pfns; alloc_pfns--){
+
+    /* allocate first page */
+    pf = list_entry(temp, struct pfn_info, list);
+    pf->flags |= p->domain;
+    temp = temp->next;
+    list_del(&pf->list);
+    pf->next = pf->prev = p->pg_head = (pf - frame_table);
+    free_pfns--;
+    pf_head = pf;
+
+    /* allocate the rest */
+    for(alloc_pfns = req_pages - 1; alloc_pfns; alloc_pfns--){
         pf = list_entry(temp, struct pfn_info, list);
         pf->flags |= p->domain;
         temp = temp->next;
         list_del(&pf->list);
 
-        if(p->pg_tail){
-            pf->next = p->pg_tail;
-            (frame_table + pf->next)->prev = p->pg_tail = (pf - frame_table); 
-        } else {
-            p->pg_head = (pf - frame_table);
-            p->pg_tail = p->pg_head;
-            pf->next = 0;
-            pf->prev = 0;
-        }
-        pf->prev = 0;
+        pf->next = p->pg_head;
+        pf->prev = pf_head->prev;
+        (frame_table + pf_head->prev)->next = (pf - frame_table);
+        pf_head->prev = (pf - frame_table);
 
         free_pfns--;
     }
@@ -396,6 +401,7 @@ int setup_guestos(struct task_struct *p, dom0_newdomain_t *params)
     unsigned long cur_address, end_address, alloc_address, vaddr;
     unsigned long virt_load_address, virt_stack_address, virt_shinfo_address;
     unsigned long virt_ftable_start_addr = 0, virt_ftable_end_addr;
+    unsigned long ft_mapping = frame_table;
     unsigned int ft_size = 0;
     start_info_t  *virt_startinfo_address;
     unsigned long long time;
@@ -527,7 +533,7 @@ int setup_guestos(struct task_struct *p, dom0_newdomain_t *params)
     /* for DOM0, setup mapping of frame table */
     if ( dom == 0 )
     {
-        virt_ftable_start_addr = virt_load_address + virt_shinfo_address + PAGE_SIZE;
+        virt_ftable_start_addr = virt_shinfo_address + PAGE_SIZE;
         virt_ftable_end_addr = virt_ftable_start_addr + frame_table_size;
         for(cur_address = virt_ftable_start_addr;
             cur_address < virt_ftable_end_addr;
@@ -535,7 +541,8 @@ int setup_guestos(struct task_struct *p, dom0_newdomain_t *params)
         {
             l2tab = pagetable_ptr(p->mm.pagetable) + l2_table_offset(cur_address);
             l1tab = l2_pgentry_to_l1(*l2tab) + l1_table_offset(cur_address); 
-            *l1tab = mk_l1_pgentry(__pa(cur_address)|L1_PROT);
+            *l1tab = mk_l1_pgentry(__pa(ft_mapping)|L1_PROT);
+            ft_mapping += PAGE_SIZE;
         }
     }
 

diff --git a/xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h b/xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h
index 5f57125e6e0f886d7df47286e3bf3b96426ef717..22765150f51853c4924a1a33c40340e1732ed543 100644 (file)
--- a/xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h
+++ b/xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h
@@ -262,8 +262,8 @@ typedef struct start_info_st {
     net_ring_t *net_rings;
     int num_net_rings;
     blk_ring_t *blk_ring;         /* block io communication rings */
-    unsigned char cmd_line[1];    /* variable-length */
     unsigned long frame_table;    /* mapping of the frame_table for dom0 */
+    unsigned char cmd_line[1];    /* variable-length */
 } start_info_t;
 
 /* For use in guest OSes. */

diff --git a/xen-2.4.16/include/xeno/sched.h b/xen-2.4.16/include/xeno/sched.h
index ae3457ce3f89059ff59cb89d98fa1861653b66c7..17d9ff64e3ae9d8c5d85b9391869f26de8061943 100644 (file)
--- a/xen-2.4.16/include/xeno/sched.h
+++ b/xen-2.4.16/include/xeno/sched.h
@@ -80,7 +80,6 @@ struct task_struct {
      * domain together
      */
     unsigned long pg_head;
-    unsigned long pg_tail;
     unsigned int tot_pages;
 
     unsigned long flags;

diff --git a/xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs/hypervisor-if.h b/xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs/hypervisor-if.h
index 6a362d36356440ab2c137b216c42bac6931a1733..60011495ed48c428fe67cdd4702eac1ac3907f0c 100644 (file)
--- a/xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs/hypervisor-if.h
+++ b/xenolinux-2.4.16-sparse/include/asm-xeno/hypervisor-ifs/hypervisor-if.h
@@ -262,6 +262,7 @@ typedef struct start_info_st {
     net_ring_t *net_rings;
     int num_net_rings;
     blk_ring_t *blk_ring;         /* block io communication rings */
+    unsigned long frame_table;    /* mapping of the frame_table for dom0 */
     unsigned char cmd_line[1];    /* variable-length */
 } start_info_t;